Forward merge into dev. Preparing new release by astaykov · Pull Request #1473 · microsoft/zerotrustassessment

Anton Staykov (astaykov) · 2026-08-01T18:13:33Z

Prepare new release.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…-aligned verdict logic and table output

…able heading

Fix formatting in Test-Assessment.41034.ps1.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

… tests

…ving test output formatting

…ront Door WAF (#1448)

…utbound, and availability defense planes (#1442)

…into astaykov/preview-report

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…) is enforced via Intune (#1461)

…e Units) is provisioned in the tenant (#1454) Looks good

…t/zerotrustassessment into align-ui

…chart and add it to src-current (#1466) This PR - Adds `Total agents` count in overview page using logic presented in #1456 (comment) - Adds `Active users` count in overview page using logic presented in #1456 (comment) - Refactored Azure Network Security circle chart w.r.t. updated spec 27023 - Updated src-current to include Azure Network Security chart.

Copilot

Pull request overview

This PR prepares the next release by expanding the assessment scope (pillars) and report outputs (default + classic), while adding a new “current”/next-gen report UI and strengthening privacy by sanitizing error details persisted into results and logs.

Changes:

Adds a new Vite build + React app variant under src/report/src-curent/ and wires it into build scripts/templates.
Updates PowerShell reporting to generate two HTML reports (default + classic) and introduces error/result sanitization to reduce secret leakage risk.
Adds/updates assessment tests (new SecOps/Network tests, metadata updates, and removal of an obsolete test).

Reviewed changes

Copilot reviewed 121 out of 126 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
src/report/vite.config.current.ts	Adds Vite config for the “current” report template build.
src/report/tailwind.config.js	Expands Tailwind content paths to include new HTML + `src-curent`.
src/report/src/config/report-data.ts	Extends report schema (AgentOverview, DeviceSummary) and seeds new fields in sample data.
src/report/src/components/overview/swg-defense-layers.tsx	UI tweaks for opacity math and badge sizing.
src/report/src/components/overview/azure-netsec-planes.tsx	Adds classic-template Azure network security “planes” visualization.
src/report/src/components/nivo/sankey.tsx	Sanitizes/filters Sankey topology inputs to avoid invalid links/nodes.
src/report/src/components/layouts/Footer.tsx	Shows version + date/time in footer for classic template.
src/report/src-curent/vite-env.d.ts	Adds `global.basename` typing for the “current” app.
src/report/src-curent/types/table.d.ts	Adds TanStack column meta augmentation (`label`).
src/report/src-curent/Router.tsx	Introduces hash router for the “current” app with `basename`.
src/report/src-curent/pages/SecOps.tsx	Adds SecOps pillar page for the “current” UI.
src/report/src-curent/pages/NoMatch.tsx	Adds 404 page for the “current” UI.
src/report/src-curent/pages/Network.tsx	Adds Network pillar page for the “current” UI.
src/report/src-curent/pages/Infrastructure.tsx	Adds Infrastructure pillar page for the “current” UI.
src/report/src-curent/pages/Devices.tsx	Adds Devices pillar page with tabs + insights section.
src/report/src-curent/pages/Data.tsx	Adds Data pillar page for the “current” UI.
src/report/src-curent/pages/Apps.tsx	Adds Apps placeholder page (currently “coming soon”).
src/report/src-curent/pages/AI.tsx	Adds AI pillar page for the “current” UI.
src/report/src-curent/main.tsx	Boots the “current” React app.
src/report/src-curent/lib/utils.ts	Adds `cn()` helper (clsx + tailwind-merge).
src/report/src-curent/lib/format-utils.ts	Adds numeric formatting helpers + metric descriptions.
src/report/src-curent/index.css	Adds theme variables + Nivo tooltip styling and base Tailwind layers.
src/report/src-curent/hooks/useTheme.tsx	Adds hook to access theme context.
src/report/src-curent/hooks/useDemoToast.tsx	Adds demo toast behavior based on `reportData.IsDemo`.
src/report/src-curent/contexts/ThemeContext.tsx	Adds theme provider with storage + system-theme tracking.
src/report/src-curent/config/menu.ts	Adds menu model and filters menu items by available pillar totals.
src/report/src-curent/config/app.ts	Adds basic app metadata (name + GitHub URL).
src/report/src-curent/components/ui/tooltip.tsx	Adds tooltip component wrapper.
src/report/src-curent/components/ui/tabs.tsx	Adds tabs component wrapper.
src/report/src-curent/components/ui/table.tsx	Adds table component wrappers.
src/report/src-curent/components/ui/switch.tsx	Adds switch component wrapper.
src/report/src-curent/components/ui/sonner.tsx	Adds themed toast provider wrapper.
src/report/src-curent/components/ui/sheet.tsx	Adds sheet (drawer) component with optional maximize support.
src/report/src-curent/components/ui/separator.tsx	Adds separator wrapper.
src/report/src-curent/components/ui/scroll-area.tsx	Adds scroll-area wrapper.
src/report/src-curent/components/ui/label.tsx	Adds label wrapper.
src/report/src-curent/components/ui/input.tsx	Adds input wrapper.
src/report/src-curent/components/ui/dropdown-menu.tsx	Adds dropdown menu wrappers.
src/report/src-curent/components/ui/card.tsx	Adds card wrappers.
src/report/src-curent/components/ui/button.tsx	Adds button wrappers.
src/report/src-curent/components/ui/badge.tsx	Adds badge wrapper and variants (incl. success/warning).
src/report/src-curent/components/ui/avatar.tsx	Adds avatar wrapper.
src/report/src-curent/components/ui/accordion.tsx	Adds accordion wrapper.
src/report/src-curent/components/test-table/item-sheet.tsx	Adds placeholder item sheet component.
src/report/src-curent/components/test-table/data-icons.tsx	Defines status/impact icon metadata for table rendering.
src/report/src-curent/components/test-table/columns.tsx	Defines TanStack table columns for test results.
src/report/src-curent/components/status-icon.tsx	Adds status badge renderer for tests.
src/report/src-curent/components/page-header.tsx	Adds page header components for “current” UI.
src/report/src-curent/components/overview/mobile-sankey.tsx	Adds mobile Sankey wrapper for “current” UI.
src/report/src-curent/components/overview/desktop-devices-sankey.tsx	Adds desktop Sankey wrapper for “current” UI.
src/report/src-curent/components/overview/caDevice-sankey.tsx	Adds CA device Sankey wrapper for “current” UI.
src/report/src-curent/components/overview/ca-sankey.tsx	Adds CA Sankey wrapper for “current” UI.
src/report/src-curent/components/overview/azure-netsec-planes.tsx	Adds “current” UI Azure network security planes component.
src/report/src-curent/components/overview/authMethod-sankey.tsx	Adds auth method Sankey wrapper for “current” UI.
src/report/src-curent/components/nivo/sankey.tsx	Adds “current” UI Sankey component with input sanitization + theming.
src/report/src-curent/components/mode-toggle.tsx	Adds theme mode toggle for “current” UI.
src/report/src-curent/components/logo.tsx	Adds app logo component for header branding.
src/report/src-curent/components/layouts/Header.tsx	Adds “current” UI header with desktop + mobile navigation.
src/report/src-curent/components/layouts/Footer.tsx	Adds “current” UI footer with resources/support links and version/date.
src/report/src-curent/components/layouts/AppLayout.tsx	Adds “current” UI layout wrapper.
src/report/src-curent/components/icons.tsx	Adds icon set (logo + GitHub).
src/report/src-curent/assets/react.svg	Adds React asset (likely template residue / placeholder).
src/report/src-curent/App.tsx	Wires router + theme provider + toaster for “current” UI.
src/report/src-curent/App.css	Adds default Vite template CSS (likely template residue / placeholder).
src/report/report-build.ps1	Reworks build script to build/copy both templates via a parameter.
src/report/README.md	Updates report dev/build instructions for classic vs current templates.
src/report/package.json	Updates scripts to use PowerShell build orchestrator + adds dev/build current.
src/report/index.current.html	Adds HTML entrypoint for “current” template build.
src/powershell/tests/Test-Assessment.50001.ps1	Adds missing test metadata (ImplementationCost, UserImpact).
src/powershell/tests/Test-Assessment.41215.ps1	Adds new test for Security Copilot capacity via Azure Resource Graph.
src/powershell/tests/Test-Assessment.41215.md	Adds markdown narrative for test 41215.
src/powershell/tests/Test-Assessment.41211.md	Updates markdown narrative for test 41211.
src/powershell/tests/Test-Assessment.41209.md	Updates markdown narrative for test 41209.
src/powershell/tests/Test-Assessment.41116.ps1	Adds new test validating M365 Defender advanced hunting EmailEvents availability.
src/powershell/tests/Test-Assessment.41116.md	Adds markdown narrative for test 41116.
src/powershell/tests/Test-Assessment.41114.md	Updates markdown narrative for test 41114.
src/powershell/tests/Test-Assessment.41052.md	Updates markdown narrative for test 41052.
src/powershell/tests/Test-Assessment.41034.md	Updates markdown narrative for test 41034.
src/powershell/tests/Test-Assessment.41033.md	Updates markdown narrative for test 41033.
src/powershell/tests/Test-Assessment.35037.ps1	Removes obsolete audit logging test implementation.
src/powershell/tests/Test-Assessment.35037.md	Removes obsolete audit logging test narrative.
src/powershell/tests/Test-Assessment.27024.ps1	Adds new test validating Front Door WAF HTTP DDoS ruleset enablement.
src/powershell/tests/Test-Assessment.27024.md	Adds markdown narrative for test 27024.
src/powershell/tests/Test-Assessment.25375.md	Updates markdown narrative for test 25375.
src/powershell/public/Invoke-ZtAssessment.ps1	Adjusts pillar/preview semantics and emits two HTML reports (default + classic).
src/powershell/private/tests/Write-ZtTestError.ps1	Uses safe error record + safe formatting for unexpected test errors.
src/powershell/private/tests/New-ZtSafeErrorRecord.ps1	Adds helper to clone/sanitize error records (remove TargetObject).
src/powershell/private/tests/Invoke-ZtTests.ps1	Updates stable pillar filtering logic (now includes more pillars by default).
src/powershell/private/tests/Invoke-ZtTest.ps1	Uses safe error record + safe formatting for unexpected test errors.
src/powershell/private/tests/Get-ZtSafeErrorMessage.ps1	Adds allow-listed safe error summary extraction (status/code/IDs/URL sans query).
src/powershell/private/tests/Format-ZtTestErrorDetail.ps1	Adds safe markdown formatting for unexpected test errors.
src/powershell/private/tests-shared/Get-SentinelWorkspaceData.ps1	Adds `OnboardingError` flag for Sentinel onboarding checks.
src/powershell/private/tenantinfo/Invoke-ZtTenantInfo.ps1	Always collects agent overview and device overview earlier in Devices pillar.
src/powershell/private/tenantinfo/ai/Add-ZtAgentOverview.ps1	Adds tenant-info collection for agent inventory + recent activity.
src/powershell/private/core/Protect-ZtReportText.ps1	Adds defense-in-depth redaction of common credential patterns in report text.
src/powershell/private/core/Get-ZtAssessmentResults.ps1	Updates summaries for additional pillars and clarifies preview-only filtering.
src/powershell/private/core/Get-HtmlReport.ps1	Adds optional template path + stronger temp-path handling and marker validation.
src/powershell/private/core/Add-ZtTestResultDetail.ps1	Adds report-text sanitization at persistence boundary.
src/powershell/doc/readme.md	Updates docs for default pillar set + dual report outputs + preview semantics.
README.md	Updates top-level README to reflect new default pillars behavior.
code-tests/test-assessments/Test-Assessment.41215.Tests.ps1	Adds Pester coverage for new test 41215 behavior.
code-tests/commands/Invoke-ZtTenantInfo.Tests.ps1	Adds Pester coverage for updated tenant-info collection behavior.
code-tests/commands/ErrorSanitization.Tests.ps1	Adds Pester coverage ensuring secrets are redacted/sanitized in errors/results/logs.
code-tests/commands/Add-ZtAgentOverview.Tests.ps1	Adds Pester coverage for new agent overview collection.

+            const date = new Date(dateString);
+            const dateStr = date.toLocaleDateString('en-US', {
                year: 'numeric',
                month: 'long',
                day: 'numeric'
            });
+            const timeStr = date.toLocaleTimeString('en-US', {
+                hour: '2-digit',
+                minute: '2-digit',
+                second: '2-digit',
+                hour12: false
+            });
+            return `${dateStr}, ${timeStr} UTC`;


+            const date = new Date(dateString);
+            const dateStr = date.toLocaleDateString('en-US', {
+                year: 'numeric',
+                month: 'long',
+                day: 'numeric'
+            });
+            const timeStr = date.toLocaleTimeString('en-US', {
+                hour: '2-digit',
+                minute: '2-digit',
+                second: '2-digit',
+                hour12: false
+            });
+            return `${dateStr}, ${timeStr} UTC`;


+
+import { mainMenu } from "@/config/menu";
+import { ChevronDownIcon, ViewVerticalIcon } from "@radix-ui/react-icons";
+import { ScrollArea } from "@radix-ui/react-scroll-area";


+export function Header() {
+    const [open, setOpen] = useState(false)
+    const location = useLocation();
+    console.log(reportData);


+            <path fill-rule="evenodd" clip-rule="evenodd" fill="#F35123" d="M0 0h7v7h-7z" />
+            <path fill-rule="evenodd" clip-rule="evenodd" fill="#01A4EF" d="M0 9h7v7h-7z" />
+            <path fill-rule="evenodd" clip-rule="evenodd" fill="#7FBA00" d="M9 0h7v7h-7z" />
+            <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFB901" d="M9 9h7v7h-7z" />


+        Category = 'Azure Network Security',
+        ImplementationCost = 'Low',
+        MinimumLicense = ('Consumption-based: Azure WAF on Azure Front Door Premium'),
+        Service = ('Azure'),
+        Pillar = 'Network',


+import Balance from "react-wrap-balancer"
+
+import { cn } from "@/lib/utils"


Anton Staykov (astaykov) · 2026-08-01T18:24:55Z

Ignore typescript finding as this is not live typescript site but a pre-compiled html out of the typescript site.

Manoj Kesana (Manoj-Kesana) and others added 30 commits July 2, 2026 17:35

Feature-41033

1b5b918

initial commit

a5d5191

removed unnecessary code

2055d36

Refactored the code

f829035

add skip condition for USGov Env and Security Reader role in docs

b76fbc7

Potential fix for pull request finding

c07d4d7

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

3d07cc8

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

refactored code

3d991ef

Fix ambigious values and Remove readme.md (moving to separate PR)

f06fb56

chore: restore readme.md to dev state (moving to separate PR)

4d8c226

Fix ambigious values for Q1, Q2 & Q3

4483dbd

Feedback addressed

5e8f4d0

add ZAP exception scope

e500905

initial commit

a3ec2b7

Implement anti-spam hosted content filter policy assessment with spec…

c82288f

…-aligned verdict logic and table output

uodate(41034): Investigate message formatting and add portal-linked t…

7635f9e

…able heading

Resolving copilot comments

453ad12

Correct whitespace in Test-Assessment.41034.ps1

de3b8d0

Fix formatting in Test-Assessment.41034.ps1.

Initial draft

0f7af1a

refactored code acc to updated spec

e5a89c9

fixed issues

dfd18d4

removed unused variables

770d98a

removed copilot comments

2637b82

resolved builtin safe links policy edge case

53defa8

fix ambigious value issue

b58b026

Refactored

6afd769

unused

bef8386

Potential fix for pull request finding

cecfc9b

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Implement error sanitization and reporting improvements in assessment…

6600400

… tests

Enhance error sanitization by adding query secret redaction and impro…

5d95210

…ving test output formatting

Anton Staykov (astaykov) and others added 25 commits July 28, 2026 15:06

Network - 27024 - HTTP DDoS protection rule set is enabled in Azure F…

fb58e39

…ront Door WAF (#1448)

Add a Pester test

9cd0abb

Intial draft

6dffa93

Network - 27023 - Azure workloads are protected across the inbound, o…

9e53f3a

…utbound, and availability defense planes (#1442)

made changes as per Alek's suggestions

a271719

Merge branch 'dev' of https://github.com/microsoft/zerotrustassessment …

4ddb12b

…into astaykov/preview-report

updating templates and reports

e69415b

Heading

1ed6cfe

add yellow color to circle chart ring when fail % is less than 80

f9bcdab

Potential fix for pull request finding

1557cc2

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

add agent Total agents and Active users in overview page

862dc4e

Feedback addressed

54fe45c

link

0b35a0e

made changes as per Alek's suggestions

b8ae5fe

SecOps - 41052 - Application control (WDAC / App Control for Business…

19001aa

…) is enforced via Intune (#1461)

updated azure network chart according to spec update

1d8f8d6

move and align azure network chart to src-current

79e7367

aligned circle chart in src-current

c1b7144

SecOps - 41215 - Microsoft Security Copilot capacity (Security Comput…

1b12e22

…e Units) is provisioned in the tenant (#1454) Looks good

add pester test for agent overview function

9e9338c

Fix preview report validation failures

58fa6ad

Merge branch 'astaykov/preview-report' of https://github.com/microsof…

beca437

…t/zerotrustassessment into align-ui

fix typo in outbound plane

b0a160e

Astaykov/preview report DO NOT REVIEW | DO NOT MERGE (#1464)

bcd41bb

Copilot AI review requested due to automatic review settings August 1, 2026 18:13

Copilot started reviewing on behalf of Anton Staykov (astaykov) August 1, 2026 18:14 View session

Copilot AI reviewed Aug 1, 2026

View reviewed changes

Anton Staykov (astaykov) merged commit 27fbcc6 into main Aug 1, 2026
6 checks passed

Navigation Menu

Uh oh!

Forward merge into dev. Preparing new release - #1473

Forward merge into dev. Preparing new release#1473
Anton Staykov (astaykov) merged 120 commits into
mainfrom
dev

Anton Staykov (astaykov) commented Aug 1, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Anton Staykov (astaykov) commented Aug 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

		import Balance from "react-wrap-balancer"

		import { cn } from "@/lib/utils"

Uh oh!

Conversation

Anton Staykov (astaykov) commented Aug 1, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Anton Staykov (astaykov) commented Aug 1, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants